Make sure item_area is positioned correctly. Fix #133070, reported by

Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
	item_area is positioned correctly. Fix #133070, reported by Jeroen
	Zwartepoorte.

diff --git a/ChangeLog b/ChangeLog
index 878e8e02a15ad7444e9533b6953339977c953814..581635d56e48b9e93238ff236bafeafcdc447522 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
+       item_area is positioned correctly. Fix #133070, reported by Jeroen
+       Zwartepoorte.
+
 Sat Jan 31 23:13:43 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 878e8e02a15ad7444e9533b6953339977c953814..581635d56e48b9e93238ff236bafeafcdc447522 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
+       item_area is positioned correctly. Fix #133070, reported by Jeroen
+       Zwartepoorte.
+
 Sat Jan 31 23:13:43 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 878e8e02a15ad7444e9533b6953339977c953814..581635d56e48b9e93238ff236bafeafcdc447522 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
+       item_area is positioned correctly. Fix #133070, reported by Jeroen
+       Zwartepoorte.
+
 Sat Jan 31 23:13:43 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 878e8e02a15ad7444e9533b6953339977c953814..581635d56e48b9e93238ff236bafeafcdc447522 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
+       item_area is positioned correctly. Fix #133070, reported by Jeroen
+       Zwartepoorte.
+
 Sat Jan 31 23:13:43 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 878e8e02a15ad7444e9533b6953339977c953814..581635d56e48b9e93238ff236bafeafcdc447522 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
+       item_area is positioned correctly. Fix #133070, reported by Jeroen
+       Zwartepoorte.
+
 Sat Jan 31 23:13:43 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 45f98d481911e2befb9e6415b4fc3f09aa0b8f3a..94524f7519d2239a198cfb03cab2777230b951ea 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1444,8 +1444,8 @@ gtk_toolbar_size_allocate (GtkWidget     *widget,
       arrow_allocation.y = border_width;
     }
   
-  item_area.x = 0;
-  item_area.y = 0;
+  item_area.x = border_width;
+  item_area.y = border_width;
   item_area.width = available_size - (need_arrow? arrow_size : 0);
   item_area.height = short_size;